Avoid warning when specifying NULL for "attributes" property

* gtk/gtkcellrenderertext.c:
Avoid warning when specifying NULL for "attributes" property

diff --git a/ChangeLog b/ChangeLog
index 80d1c6df7d5042139e9cedc8fed8db4117017bc0..f503828474bbf427c12d21b19451ee34a3c8faef 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2001-08-15  Padraig O'Briain  <padraig.obriain@sun.com>
+
+       * gtk/gtkcellrenderertext.c:
+       Avoid warning when specifying NULL for "attributes" property
+
 2001-08-15  Matthias Clasen  <matthiasc@waldgeist.poet.de>
 
        * docs/debugging.txt: Add a warning about --enable-debug=no,

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 80d1c6df7d5042139e9cedc8fed8db4117017bc0..f503828474bbf427c12d21b19451ee34a3c8faef 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,8 @@
+2001-08-15  Padraig O'Briain  <padraig.obriain@sun.com>
+
+       * gtk/gtkcellrenderertext.c:
+       Avoid warning when specifying NULL for "attributes" property
+
 2001-08-15  Matthias Clasen  <matthiasc@waldgeist.poet.de>
 
        * docs/debugging.txt: Add a warning about --enable-debug=no,

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 80d1c6df7d5042139e9cedc8fed8db4117017bc0..f503828474bbf427c12d21b19451ee34a3c8faef 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2001-08-15  Padraig O'Briain  <padraig.obriain@sun.com>
+
+       * gtk/gtkcellrenderertext.c:
+       Avoid warning when specifying NULL for "attributes" property
+
 2001-08-15  Matthias Clasen  <matthiasc@waldgeist.poet.de>
 
        * docs/debugging.txt: Add a warning about --enable-debug=no,

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 80d1c6df7d5042139e9cedc8fed8db4117017bc0..f503828474bbf427c12d21b19451ee34a3c8faef 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,8 @@
+2001-08-15  Padraig O'Briain  <padraig.obriain@sun.com>
+
+       * gtk/gtkcellrenderertext.c:
+       Avoid warning when specifying NULL for "attributes" property
+
 2001-08-15  Matthias Clasen  <matthiasc@waldgeist.poet.de>
 
        * docs/debugging.txt: Add a warning about --enable-debug=no,

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 80d1c6df7d5042139e9cedc8fed8db4117017bc0..f503828474bbf427c12d21b19451ee34a3c8faef 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+2001-08-15  Padraig O'Briain  <padraig.obriain@sun.com>
+
+       * gtk/gtkcellrenderertext.c:
+       Avoid warning when specifying NULL for "attributes" property
+
 2001-08-15  Matthias Clasen  <matthiasc@waldgeist.poet.de>
 
        * docs/debugging.txt: Add a warning about --enable-debug=no,

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 80d1c6df7d5042139e9cedc8fed8db4117017bc0..f503828474bbf427c12d21b19451ee34a3c8faef 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+2001-08-15  Padraig O'Briain  <padraig.obriain@sun.com>
+
+       * gtk/gtkcellrenderertext.c:
+       Avoid warning when specifying NULL for "attributes" property
+
 2001-08-15  Matthias Clasen  <matthiasc@waldgeist.poet.de>
 
        * docs/debugging.txt: Add a warning about --enable-debug=no,

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 80d1c6df7d5042139e9cedc8fed8db4117017bc0..f503828474bbf427c12d21b19451ee34a3c8faef 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+2001-08-15  Padraig O'Briain  <padraig.obriain@sun.com>
+
+       * gtk/gtkcellrenderertext.c:
+       Avoid warning when specifying NULL for "attributes" property
+
 2001-08-15  Matthias Clasen  <matthiasc@waldgeist.poet.de>
 
        * docs/debugging.txt: Add a warning about --enable-debug=no,

diff --git a/gtk/gtkcellrenderertext.c b/gtk/gtkcellrenderertext.c
index 2e20f3e16bc3c05c111be92cddef20350a0b21d1..6cd6347e440d8a744fe85c971eb2ea01b9f60048 100644 (file)
--- a/gtk/gtkcellrenderertext.c
+++ b/gtk/gtkcellrenderertext.c
@@ -714,7 +714,8 @@ gtk_cell_renderer_text_set_property (GObject      *object,
        pango_attr_list_unref (celltext->extra_attrs);
 
       celltext->extra_attrs = g_value_get_boxed (value);
-      pango_attr_list_ref (celltext->extra_attrs);
+      if (celltext->extra_attrs)
+        pango_attr_list_ref (celltext->extra_attrs);
       break;
     case PROP_MARKUP:
       {